From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 1 Aug 2011 14:14:23 +0000 (+0200)
Subject: Fix critical when setting a NULL label
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8010
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e01baf2a2542e10807a724621098b010a0c4a799;p=gnome-shell.git

Fix critical when setting a NULL label

st_label_set_text() does not accept NULL, and emits a g_critical
in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=654638
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a4372b5a5..a4081ffee 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -674,7 +674,7 @@ NMDevice.prototype = {
         let dev_product = this.device.get_product();
         let dev_vendor = this.device.get_vendor();
         if (!dev_product || !dev_vendor)
-	    return null;
+	    return '';
 
         let product = Util.fixupPCIDescription(dev_product);
         let vendor = Util.fixupPCIDescription(dev_vendor);